Crossgen2 ARM64 runs & initial cross-targeting support #37331
Conversation
trylek
force-pushed
the
CG2Arm64
branch
2 times, most recently
from
b79a433 to
6929a63
Compare
trylek
force-pushed
the
CG2Arm64
branch
3 times, most recently
from
ecf862f to
e8279ca
Compare
trylek
changed the title
trylek
requested review from
MichalStrehovsky,
jkotas,
nattress and
davidwrighton
|
To my own surprise I see only one error on ARM64, the GitHub_27924 JitBlue regression test. I'll create a GitHub tracking issue and I'll push another commit adding it to issues.targets. |
|
OK, the issue on Windows is apparently #34316. |
This change introduces initial provisions for dynamically loading native Crossgen2 components (jitinterface, clrjit) based on the hosting / targeting OS and architecture. In general, jitinterface depends on the hosting OS and architecture, clrjit depends on both host and target characteristics. As of this commit, the host environment is represented by the first subfolder level beneath the "crossgen2" executable; its currently supported name combinations are host-win-x64, host-win-arm64, host-lnx-x64, host-lnx-arm64. Targeting environment is represented by the second-level subfolder under the hosting folder; its currently supported name combinations are target-win-x64, target-win-arm64, target-lnx-x64, target-lnx-arm64. Thanks Tomas
src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
Outdated
Show resolved
Hide resolved
Remove obsoleted methods GetLibraryPrefix and GetLibraryExtension; Put installer pkgproj in sync with the updated clrjit naming; Move _lastException to the other instance fields in CorInfoImpl; Add TargetSpec mapping for all four CPU architectures.
...lr/src/tools/crossgen2/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilationBuilder.cs
Outdated
Show resolved
Hide resolved
...lr/src/tools/crossgen2/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilationBuilder.cs
Outdated
Show resolved
Hide resolved
src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj
Outdated
Show resolved
Hide resolved
- Use TargetDetails to pass the target OS / arch info; - Remove obsoleted Error clause from the installer pkg script; - Deleted unneeded using clauses from R2RCGCompilationBuilder.
Please fix the PR and commit description before merging. I have reviewed all the new commits — thanks for working on this! |
| IntPtr libHandle = IntPtr.Zero; | ||
| if (libName == CorInfoImpl.JitLibrary) | ||
| { | ||
| if (s_jitLibrary == IntPtr.Zero) |
There was a problem hiding this comment.
Nit: I'm not sure caching this buys us much (if anything). I tend to prefer less code.
There was a problem hiding this comment.
Makes sense, removed in 26th commit.
| <ItemsToSign Include="$(CoreCLRCrossgen2Dir)jitinterface.dll" /> | ||
|
|
||
| <ItemsToSign Condition="'$(TargetOS)' == 'Windows_NT'" Include="$(CoreCLRCrossgen2Dir)clrjit-win-$(TargetArchitecture).dll" /> | ||
| <ItemsToSign Condition="'$(TargetOS)' != 'Windows_NT'" Include="$(CoreCLRCrossgen2Dir)clrjit-unix-$(TargetArchitecture).dll" /> |
There was a problem hiding this comment.
Isn't this list Windows-only? This native binary won't have the .dll extension on Linux/macOS.
There was a problem hiding this comment.
Apparently this script is Windows-only as the other names like "crossgen2.exe" indicate. I don't know if there's an equivalent list for Linux, I haven't found any.
There was a problem hiding this comment.
So did you add these Conditions for potential cross-OS compilation in future?
ghost
locked as resolved and limited conversation to collaborators
This change introduces initial provisions for dynamically loading
the native JIT based on the targeting OS and architecture; the change
expects the potentially multiple versions of clrjit to coexist with
Crossgen2 in the same folder, marked by a OS / arch suffix. Based
on these prerequisites the change adds ARM64 jobs to the Crossgen2
pipeline.
Thanks
Tomas